fix use of magic constant "-1" in the aux info structure.

2001-03-31  James Henstridge  <james@daa.com.au>

        * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
        constant "-1" in the aux info structure.

diff --git a/ChangeLog b/ChangeLog
index e38f7f7af11ed1b673d53d800c7207aedcf2c9bb..cbe63d16d8de92e4702d1b415e3000cf303eebd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-31  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
+       constant "-1" in the aux info structure.
+
 2001-03-30  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkbutton.c (gtk_button_get_property):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e38f7f7af11ed1b673d53d800c7207aedcf2c9bb..cbe63d16d8de92e4702d1b415e3000cf303eebd6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-03-31  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
+       constant "-1" in the aux info structure.
+
 2001-03-30  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkbutton.c (gtk_button_get_property):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e38f7f7af11ed1b673d53d800c7207aedcf2c9bb..cbe63d16d8de92e4702d1b415e3000cf303eebd6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-03-31  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
+       constant "-1" in the aux info structure.
+
 2001-03-30  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkbutton.c (gtk_button_get_property):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e38f7f7af11ed1b673d53d800c7207aedcf2c9bb..cbe63d16d8de92e4702d1b415e3000cf303eebd6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-03-31  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
+       constant "-1" in the aux info structure.
+
 2001-03-30  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkbutton.c (gtk_button_get_property):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e38f7f7af11ed1b673d53d800c7207aedcf2c9bb..cbe63d16d8de92e4702d1b415e3000cf303eebd6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-03-31  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
+       constant "-1" in the aux info structure.
+
 2001-03-30  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkbutton.c (gtk_button_get_property):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e38f7f7af11ed1b673d53d800c7207aedcf2c9bb..cbe63d16d8de92e4702d1b415e3000cf303eebd6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-03-31  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
+       constant "-1" in the aux info structure.
+
 2001-03-30  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkbutton.c (gtk_button_get_property):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e38f7f7af11ed1b673d53d800c7207aedcf2c9bb..cbe63d16d8de92e4702d1b415e3000cf303eebd6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-03-31  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
+       constant "-1" in the aux info structure.
+
 2001-03-30  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkbutton.c (gtk_button_get_property):

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 8f6820e0b786c19cca6b448bfe4392ef6048f31d..5500183deebd34effd30ccab5b3c9b91e897dfbb 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2169,9 +2169,9 @@ gtk_widget_size_allocate (GtkWidget       *widget,
   
   if (aux_info)
     {
-      if (aux_info->x != -1)
+      if (aux_info->x_set)
        real_allocation.x = aux_info->x;
-      if (aux_info->y != -1)
+      if (aux_info->y_set)
        real_allocation.y = aux_info->y;
     }